Use stock print icons; make it compile

diff --git a/ChangeLog b/ChangeLog
index 3e218906a4c93c7b06a18edbcfc6ff8624cb2094..cbeba40194dfcc8d709239019b06a6ec9720959d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-06-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * modules/printbackends/cups/gtkprintbackendcups.c:
+       * modules/printbackends/lpr/gtkprintbackendlpr.c: Use a stock icon
+       for printers.
+
        * gtk/gtkprintunixdialog.c (add_option_to_table): Don't grow
        additional columns.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3e218906a4c93c7b06a18edbcfc6ff8624cb2094..cbeba40194dfcc8d709239019b06a6ec9720959d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-06-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * modules/printbackends/cups/gtkprintbackendcups.c:
+       * modules/printbackends/lpr/gtkprintbackendlpr.c: Use a stock icon
+       for printers.
+
        * gtk/gtkprintunixdialog.c (add_option_to_table): Don't grow
        additional columns.
 

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 8bd7b79f68d7a1bdc2ae7596afd18b82ff823267..c64974633099a2fdfe11704e612c3cfaf81063d6 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -648,7 +648,7 @@ cups_request_printer_info_cb (GtkPrintBackendCups *backend,
   response = gtk_cups_result_get_response (result);
 
   /* TODO: determine printer type and use correct icon */
-  gtk_printer_set_icon_name (printer, "printer");
+  gtk_printer_set_icon_name (printer, "gtk-print");
  
   state_msg = "";
   loc = "";

diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c
index c4b6bda5b15a4dd24f793d5a24a4229347bc4733..f86463755346ac2374830c86f332879e9dfde2d8 100644 (file)
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c
@@ -34,10 +34,9 @@
 #include <glib/gi18n-lib.h>
 
 #include "gtkprintoperation.h"
-
 #include "gtkprintbackendlpr.h"
-
 #include "gtkprinter.h"
+#include "gtkprinter-private.h"
 
 typedef struct _GtkPrintBackendLprClass GtkPrintBackendLprClass;
 
@@ -384,7 +383,7 @@ gtk_print_backend_lpr_init (GtkPrintBackendLpr *backend)
                             GTK_PRINT_BACKEND (backend),
                             TRUE); 
   gtk_printer_set_has_details (printer, TRUE);
-  gtk_printer_set_icon_name (printer, "printer");
+  gtk_printer_set_icon_name (printer, "gtk-print");
   gtk_printer_set_is_active (printer, TRUE);
   gtk_printer_set_is_default (printer, TRUE);